Merge changes Iee97d469,Ica1b552a into tm-dev am: 50f19f212e am: 9d9bf2b9e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17892807 Change-Id: Iba1886bb194fc78bacf89c4679c4eda22d0e27bd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: