Merge "Validating service components after reading them from resources" into...

Merge "Validating service components after reading them from resources" into tm-dev am: 19a82701 am: 6f19fbaf

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



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