Merge changes from topic "may27-sdk" into sc-dev am: e6fb6087 am: b3a4448b

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

Change-Id: Ifdf0c0d1c2ee8035074e3201401c77add39175f0