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