Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2267183 Change-Id: Idb18ef0319f4a36e49cc01f9d9fced1918d12096 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>