Merge "Ignore the first modem activity when system_server start" into udc-qpr-dev am: b650f99c

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



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