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