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

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

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



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