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