Merge "Fix issue in InsetsState.set" into rvc-dev am: 2a60031116 am: 284216ee00 am: 9d3f7afd4b

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

Change-Id: Ice9c39eaa7f45d93364dd656ea2c8077eb08c4f3