Merge "Revert "Add adb keys to debuggable AOSP builds""
am: 40fae9ca0f

Change-Id: I3003351ba4b043774ada2cb552895865f7e6d30e