Merge "Remove display.qservice from service_contexts."
am: 109ee5f99c

Change-Id: I47562c12713809970d8531b453f08de74c53466f