Merge "Merge "Don't use flexible inset mapping yet" into rvc-dev am: c8f49d1a am: 943887aa am: 88eb2a13" into rvc-qpr-dev-plus-aosp am: d229d823

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

Change-Id: I2413e1210d6fbf22ff500a782fd8c865fb3235d0