tree fe2115004df695410fe710e41387c99bddf5f9dc
parent 71cc8cb4246fccfd7210315a9d52cc965be4478f
parent f694989776ce672c78db34f45e7a1c6f2953d013
author Jason Monk <jmonk@google.com> 1536086277 -0700
committer android-build-merger <android-build-merger@google.com> 1536086277 -0700

[automerger skipped] Merge changes from topic "sysuibp" into pi-dev-plus-aosp
am: f694989776  -s ours

Change-Id: Ifee8c2f55697226c6c0fccb8d2d79956ecb271df