Merge "Merge "Change reference to Build.IS_DEBUGGABLE" am: 4d83e67433 am: 9ee90ab489" into qt-qpr1-dev-plus-aosp am: 6a95091780

Change-Id: Ib7e38e93d690c031d20d050502c829b37acd668b