Merge changes from topic "privacy_chip_master"

* changes:
  Restricts notified app ops based on flags
  Add back privacy chip