[automerger skipped] Adding adb_debug.prop into debug ramdisk
am: 6386c3207b -s ours
am skip reason: change_id Id6962414197fc8f47f7c07818e8fb16107dc17a3 with SHA1 05f07d89a6 is in history

Change-Id: I2239e87ac27d0a1a5258de873556ddaf21353cd6