[automerger skipped] Merge "[DO NOT MERGE] Add the logging logic to...

[automerger skipped] Merge "[DO NOT MERGE] Add the logging logic to distinguish the SS-reactivated resume media and user-activated one when there is no recommendation card." into sc-v2-dev am: 23d65f1d am: 63d35048 -s ours am: f42f6f78 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id32d6f99ce0a7b83989fcb7335a4744a25b8aaa5