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