[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 am: 0ee139f1 -s ours am: 94fc11d6 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I252c6c3adb06bf4dea68314a2fb7e82155d7ee13