Merge "Fix DAC constant in getAsuLevel" am: d9f3445ff1 am: ef20a08076 am: f58c540037

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

Change-Id: I7f46a1eb84ef81ce7e658f50e5e0c12f822a437c