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

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

Change-Id: I71cc95dd57f112fba51e41a862deacdbdc1e9b6d