Merge "Add aquilescanta to SettingsLib owners" am: e0eab7ed87 am: 1e9a408dc6 am: 036cd20571

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

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