Merge "follow up comments in  custom TTL CLS (aosp/2870274 and aosp/2606573)" into main