Merge "[RESTRICT AUTOMERGE] Fix Autofill Inflating as User 0" into tm-dev am: f66d59dd

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



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