Merge changes If69f69bf,I941b3c89 am: b3bd77fcbe

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

Change-Id: I26121ba3c1a0c1736fc61c3ccdd544171d299315