Merge "Merge "Add new window type TYPE_DRAWN_APPLICATION" into nyc-mr1-dev am: f925b8df92 am: f420c7cbd4" into nyc-mr1-dev-plus-aosp