Merge changes from topic "revert-2264526-QTJABPYRJT"

* changes:
  Revert "Get PackageManager from Context"
  Revert "Use waitForService() istead of getService()"