Upmerge android_ui.lnx.3.0 android_ui_aosp.lnx.3.0

Change-Id: I3ff1870516fd28f624eaacfba865a4e8501d93c0