Merge "Merge "Rename navigationBarHeight to navigationBarFrameHeight" into...

Merge "Merge "Rename navigationBarHeight to navigationBarFrameHeight" into tm-dev am: cf134e04 am: 37749738" into tm-d1-dev-plus-aosp am: 850b415a am: 1f2f9a15

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



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