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

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

Change-Id: I3417b4ae967d1ed2657eb4795d91bc482753ca0f