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

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix Autofill Inflating as User 0" into tm-qpr-dev am: 73d29c73 -s ours am: 165132ac -s ours am: 46ad0e87 -s ours

am skip reason: contains skip directive

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



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