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