Merge "Don't use flexible inset mapping yet" into rvc-dev am: c8f49d1a42 am: 943887aabf

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

Change-Id: I3198342a057690f11763ce9257f740786a017fab