Merge "Add controller to Advanced category in Apps page" into udc-qpr-dev am: 963869ec

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24937325



Change-Id: I39d4b0e6ffa0f071d97e4dd9b2c36c1ed22c3a2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>