[automerger skipped] Merge "DO NOT MERGE Ensure mapping between internal and public insets" into rvc-qpr-dev am: 3fe532822f am: c8a4022cad -s ours

am skip reason: subject contains skip directive

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

Change-Id: I9dc9aa7b00d03a1c7415f223cf53ab14ac041295