Merge "Fix OEMs unable to get config_supportsBubble" into stage-aosp-tm-ts-dev