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: 943887aa am: 88eb2a13

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

Change-Id: I0d61eca07704a438060deb30d4d9e92baebc50c7