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