[automerger skipped] Merge "Ignore the first modem activity when system_server start" into udc-qpr-dev am: b650f99c am: 71830f91 -s ours

am skip reason: skipped by user guanxin

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24840833



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