Merge "Add merged local insets to proto" into udc-dev am: 1dd810c1

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



Change-Id: I7e22e665b8497424f33273305b0e79c00775fe4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>