Upmerge android_ui.lnx.3.0 android_ui_aosp.lnx.3.0

Change-Id: I286cc63c2aa2ccaeaaff8aee9325652cad9bf19b