tree 61975ebfe9962d58c0a022618cfc8755e8d12145
parent ad963e5975b048b0197a5e183d1785e955a400e4
parent fd96788fe0511edd12c3338ad31b677ca53055e3
author David Christie <dnchrist@google.com> 1647964216 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1647964216 +0000

[automerger skipped] DO NOT MERGE am: 7f8c5e6371 am: 31e57724b1 -s ours am: fd96788fe0 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8d7ea5d13df6463d63c38c06880d7dc46759ada5