Merge "Include all enabled services when FEEDBACK_ALL_MASK." into qt-dev am:...

Merge "Include all enabled services when FEEDBACK_ALL_MASK." into qt-dev am: 6505ed16 am: 7588fa68 am: 10c659e3 am: 73089d0c am: 18628f19 am: cf886522 am: 70f81ff1 am: ef85e635 am: 0ac6337d am: e5b113cf

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19815423



Change-Id: Ide3a596738a48454b5bf5a08ebbb85e4e54b1f23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>