[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix Autofill Inflating as...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix Autofill Inflating as User 0" into tm-dev am: f66d59dd am: e6c25610 -s ours am: 89472bcf -s ours am: 2fdcc251 -s ours

am skip reason: contains skip directive

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



Change-Id: I91d54036833e05556a7ed82080a26b41a74c2727
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>