[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: 5bbb0679 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie06a11ae850ceab0cf0bf0c13173f4488e13dde3