Merge changes I61c84693,I929428f7 am: e6b79e2923

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

Change-Id: I5b080cd402df4aff505d4b512966326d845119be