[automerger skipped] [conflict] RESTRICT AUTOMERGE Normalize home intent am:...

[automerger skipped] [conflict] RESTRICT AUTOMERGE Normalize home intent am: b2b4bc3f am: 2248553b am: e3bcbba9 -s ours am: 3a806352 -s ours am: 92b532e5 -s ours

am skip reason: contains skip directive

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



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