Merge "Merge "Add screenshots logging" into rvc-dev am: 44cc1e27 am: e0efd49e" into rvc-d1-dev-plus-aosp