Merge "Annotate single property listener from DeviceConfig as removed. Will...
Merge "Annotate single property listener from DeviceConfig as removed. Will remove entirely after all references (esp. Play Services) are cleaned up." into qt-dev am: 75d75ce3
am: 4413b8c6
Change-Id: If2067fd426825b997f27997e1bbdf1b52dd190e0