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

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

Change-Id: Ica5e6524d2fc45db65500d36e31604deb08632a8