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

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

Change-Id: I82dc175d5e0e0144991dcb951426f174a772e02a