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