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

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

Change-Id: Id60b4897a749136010f00d5ede018991b54c7b70