Merge "[DeviceConfig] true/false should be wrapped in @code tags" am:...

Merge "[DeviceConfig] true/false should be wrapped in @code tags" am: d47a35e3 am: 0a426efb am: 278068b3 am: 5c341457 am: 85639b48 am: a7c3ab23

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



Change-Id: I5b6598e09ef380a981d489f3129f4f282c33adb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>