Merge "Add more testing for ResourceManagerService" into qt-qpr1-dev am: 49851fcb64
am: b7f9db9ca9

Change-Id: Icddae8c9ea160047e43831919853cec380c07aa9