Merge "Do not override insets frame if not set" into tm-dev am: bfa7c5d2 am: 08d79c8f

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



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