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

Change-Id: Ie9a747d95fda5579521d3d406908829a3f89d9cc