[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: 23d65f1d38 am: 63d35048af -s ours am: f42f6f7894 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17260337 Change-Id: Ic8220195c7fed74e672cbe2b7d464a66bd2f7a2c
This commit is contained in: