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