[automerger skipped] Merge changes from topic "new-intent-navUp-sc" into...

[automerger skipped] Merge changes from topic "new-intent-navUp-sc" into sc-qpr1-dev am: 73c1fc2d am: f7940302 -s ours am: cd1f942e -s ours

am skip reason: Merged-In I854dd825bfd9a2c08851980d480d1f3a177af6cf with SHA-1 89ebc8c4 is already in history

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



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