Merge "Don't query active mode after setting desired mode specs" into sc-dev am: d2e1f0af am: 6d60df75

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

Change-Id: I5924bde88df412464b7fa58f76c980751add37e7