Merge "Merge "Fix a bug in drop region." into rvc-dev am: aa30a276 am:...

Merge "Merge "Fix a bug in drop region." into rvc-dev am: aa30a276 am: 35a365c7 am: 0cd4d213" into rvc-qpr-dev-plus-aosp am: f7a09b4a

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

Change-Id: I2f5c212b2ef1406454157c222b198131e1d7ab89