Merge "Revert "Offload role manager work to background thread"" into qt-dev
am: b13d88af52

Change-Id: Ibfc34afc126beb68c6d7a408a9c142ee52238ca8