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