[automerger skipped] Merge "[DO NOT MERGE] Global actions tip" into sc-dev am:...

[automerger skipped] Merge "[DO NOT MERGE] Global actions tip" into sc-dev am: 70c9f8b8 -s ours am: af325d96 -s ours am: 7df7d457 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15188907

Change-Id: Ia2d8a2c836ba7ea5cdb77cf964cacd7d97b07f0b