Merge "Fix a bug where the wrong profile is queried" am: 167cc4a044 am: 92bbfaf0a2

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

Change-Id: I314686498e3412866e6e17fc2d4377523007589f
tree: ba37f65b277b70b4c305d9ec9d8a1cf5810eb4a2
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING