Merge "Ensure that the resize can be triggered properly" into main am: c4c91e49 am: 71842cd5

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



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