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

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

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