Merge changes Ie4161bb9,I6e61ba1c into udc-dev-plus-aosp am: 97dc5e274f am: 87b74bceed am: 18505f6d51
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983402 Change-Id: I318eedb24f90701a73f86efeb95869abd420b6a5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: