Merge changes from topic "am-055874fb391c424cb7cc40babb9bc67b"

* changes:
  [automerger skipped] Merge changes from topic "presubmit-am-7ba48eb6ba70402ba7633198b5ee3795" into tm-qpr-dev-plus-aosp am: 38967a6f -s ours am: 41a5a622 -s ours am: 0923b8d6 -s ours
  [automerger skipped] [automerge] Report visibility only when display is fully on in WallpaperService 2p: 66266df5 am: 83ed170c -s ours am: 83351ebf -s ours am: a86af867 -s ours