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