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