Merge changes from topic "am-c7e2a34086204356bd365ceeebc90f37"

* changes:
  [automerger skipped] Merge "[DO NOT MERGE] Fixed status bar glitch for apps that access internal res" into sc-v2-dev-plus-aosp am: 5e215160 -s ours am: e3c41047 -s ours am: 9541eb23 -s ours am: 23ca15b7 -s ours
  [automerger skipped] [DO NOT MERGE] Fixed status bar glitch for apps that access internal res am: e9019422 -s ours am: 5f704724 -s ours am: 347c17a4 -s ours am: 60bd741b -s ours