Merge "Merge "Set verified stamps to be trusted" into rvc-dev am: c160f758 am: 4f4ea785" into rvc-d1-dev-plus-aosp