Merge changes I26362ce1,I4ec34b99 into tm-dev am: 68453bc360 am: d441931c64
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16939928 Change-Id: I04798419aa7eae07a4d38e082089a2af35a0ebd2
This commit is contained in: