Merge "Don't use flexible inset mapping yet" into rvc-dev am: c8f49d1a am: d0eb9121 am: 7ce5d42b

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

Change-Id: Ia6ea10fdaf865128f558b27f7452287d697f8ea7