[automerger skipped] Merge "Fix DAC constant in getAsuLevel" am: d9f3445f...

[automerger skipped] Merge "Fix DAC constant in getAsuLevel" am: d9f3445f am: ef20a080 am: f58c5400 am: 33bfdb0a -s ours

am skip reason: Change-Id I2230d235a46a3cb68ae5a605f4fd526accf9bd4a with SHA-1 3e5d62a0 is in history

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

Change-Id: I98fefa42037a440f84328fc8208c9813e01d3ef7