Merge "Remove intdef usage that block bluetooth apex" am: b72b351d21 am: f81fe1cfb7

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

Change-Id: I654611d62cc38517165923724c098b5e6ec7f941