Merge changes from topic "am-873e5e9aa4f544fd825d14c334f8e89e"
* changes:
[automerger skipped] Merge "Ref count isolated uid use for long partial wakelocks" into tm-dev am: 7dd534b9 -s ours
[automerger skipped] Ref count isolated uid use for long partial wakelocks am: 7589e541 -s ours