Merge "db845c: update FCM version to 7" into main am: 6530f33293

Original change: https://android-review.googlesource.com/c/device/linaro/dragonboard/+/2984194

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