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