Merge changes from topic "nav_bar_helper_1" into tm-qpr-dev am: 2b2deec8 am: c7d35f5a

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



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