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

Change-Id: I32ff3e53910b0d162a4aa40ae0111589f979a053