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