Merge changes I4f262f42,I312edbca into udc-dev am: 4e3a03eb68
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21508450 Change-Id: Icd0064dc22bfab7e1c8b00661ae6ca7131d84923 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: