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

Merge "Don't use flexible inset mapping yet" into rvc-dev am: c8f49d1a am: d0eb9121 am: 38a3684b am: aafc6177

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

Change-Id: I9507aa0f16fe5824f95c05b358e9fffb2f033299