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