Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE

Merged-In: I1b10a646d537b76589ac948d29a479f54ba49c50
Change-Id: I50bb0a35de83d342e50ad808c4233019ea5b41ce
tree: 8ee914fb9bae7b4cb91e969275eeb4fad0ab08e9
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg