Merge "Add back @UnsupportedAppUsage to IS_DEBUGGABLE" am: b369ebee31 am: 6edf32bd8e am: 04b9df477a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1701245

Change-Id: I435f82920ceaf7ebd6d2d4a8f73b0a21a23f28ef