Merge "Do not set different gravity for non-moveable nav bar" into udc-dev am:...

Merge "Do not set different gravity for non-moveable nav bar" into udc-dev am: 64c27756 am: 3097cfc3

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



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