Merge "Remove key from adb_keys if user forgets the key." into rvc-dev am:...
Merge "Remove key from adb_keys if user forgets the key." into rvc-dev am: b76d7aa6 am: 903113eb am: aa1ed584 am: c3621060
Change-Id: Ia684dc262c37fefdebbdadb5ed31f35ce98a4bd4