Merge changes I6d5dd0a8,I106b3e4f am: 0cf3234045 am: 12ecb8f040

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

Change-Id: Ic04621eaa36aa0b2837dced4730d32f415f8dc13