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