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