[automerger skipped] Fix build for jetpack update am: b9f82bed -s ours am:...

[automerger skipped] Fix build for jetpack update am: b9f82bed -s ours am: 47c2b78f -s ours am: 8b4f036a -s ours

am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 da7f6856 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2442501



Change-Id: I0ad825c754b5940d80085d155ca425728998a828
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>