Merge "Remove keys from adb_keys after period of inactivity" into qt-dev
am: 8958c9b3d2

Change-Id: I0f24aba60a7a39ea4dca1b1dcda868d0671e0715