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