Merge "Don't use flexible inset mapping yet" into rvc-dev am: c8f49d1a42 am: d0eb9121c3 am: 38a3684b9b

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

Change-Id: I85e2f1782de476d7152ba74185a65d92b92fc0f7