This reverts commit 1fac8d4800c4cdd0c357b17ad0a271f8f3b4bee0. Change-Id: Idf3dba195f3e0ccf27103b9f7d7a67cec8c917b0
Reason: Android Auto needs to release ahead of Orla which is delayed. This change is in the way, right now, but will be re-submitted. This reverts commit 11e80575660e81d7e053d7fce604bf421ca2f3ce. Change-Id: I6661e1e780ce8aee9bdaed82fcff4f96fc3349e7
Change-Id: I265320788718672ac117c9ff6033e48d1e9161a5