[automerger skipped] Merge "Synchronize adapter registration with mCallbacks"...
[automerger skipped] Merge "Synchronize adapter registration with mCallbacks" into rvc-dev am: 04b2ace9 -s ours am: 3fcd0eb1 -s ours
am skip reason: Change-Id Ia79f6bd1fd6ffab814a15053aeaae031faf875dd with SHA-1 46074816 is in history
Change-Id: Iecde083b8c8eeb01a39c52b443e800ea81434984