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