This reverts commit c6924e68. Bug: 170959052 Test: Locally confirmed two reverts together fix app tray Change-Id: I229b39ceb90dffc3e4b932223305ab3f126b9a7f