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

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

Change-Id: Ie88d24eed304eec9d5b02e2f30cf9ace06fabe71