[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-c4facceaa73943ff9227fdc04b1856ab" into tm-dev am: a8a25799 -s ours am: 068bbab0 -s ours

am skip reason: Merged-In I59cf3c21edce836ffbe9f24a08b3a8e077c5fcf3 with SHA-1 08d14944 is already in history

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

Change-Id: I8e365e68cee6f6916c26272897f096ec706760de