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: 7ce5d42b am: 9d0b6980

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

Change-Id: Ie24afc6f82a0ac7285aedd8954a96136a99da1a5