[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: f94daa91 -s ours am: 73cc0182 -s ours

am skip reason: contains skip directive

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



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