Merge changes from topic "am-04870cc916db40ebb0847ad27beb28fa" into rvc-d1-dev-plus-aosp
* changes:
Merge "DO NOT MERGE Fix work profile change race condition in LMS" into rvc-dev am: 48e0bab2 am: 40ca7392
DO NOT MERGE Fix work profile change race condition in LMS am: 9b0b32bd am: 2b503451