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