Merge changes I6b4df388,I07becea2 into sc-dev am: ce8ca17d89

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

Change-Id: If6acf2e40a366453eaf582ca520f6c7895ee69be