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