Merge changes from topic "am-c9436a7695ce48fda5b772e6490affc9" into qt-dev-plus-aosp

* changes:
  [automerger skipped] Merge changes from topic "GameDriver" am: e10cb9bd am: a0bd6fd6 -s ours am skip reason: change_id If284bd3e0b29cb025833be29fa33179011c151d7 with SHA1 b33ffca8 is in history
  [automerger skipped] [GUP] Hard code the name of the whitelist file. am: be09eef8 am: 7d1d0c4f -s ours am skip reason: change_id Ibe9337b358b6a67600048f1661d73574d7bea607 with SHA1 3a1be746 is in history
  [automerger skipped] Add global property to store opt-in application package name. am: e23f59aa am: 4ce7aa17 -s ours am skip reason: change_id I49dfcccf387169c072fb9345f7a50c00fcdb0737 with SHA1 2d5a2bb0 is in history
  [automerger skipped] [GraphicsEnvironment] Add whitelist support. am: 443894f8 am: 7808ff2c -s ours am skip reason: change_id Ie36ca0173a90a8e48acaca2979ab64bbf92eeaed with SHA1 88c38eb6 is in history