[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: 6f9f7fe7 am: 6f1630fd -s ours am: ed8a89e2 -s ours

am skip reason: contains skip directive

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



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