[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 skip reason: subject contains skip directive

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

Change-Id: I69d9e5e6149b7c959f18da3ab0f684fe3cd53aa0