Merge "Merge "Offload initial headless app query to handler thread." into rvc-dev am: bcdd5c5321 am: fcf7175391" into rvc-d1-dev-plus-aosp