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

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



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