am d31825c6: Merge change 23403 into eclair

Merge commit 'd31825c6ff83a3e336efc97ced1b205fe65b11a9' into eclair-plus-aosp

* commit 'd31825c6ff83a3e336efc97ced1b205fe65b11a9':
  Various infrastructure to support a running services UI.