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

[automerger skipped] Merge changes from topic "new-intent-navUp-sc" into tm-dev am: 54eb5e20 -s ours

am skip reason: Merged-In I854dd825bfd9a2c08851980d480d1f3a177af6cf with SHA-1 4c355690 is already in history

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



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