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