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