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

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



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