Merge "Merge "Add WTF when a system server wrapper can't be found" into rvc-dev am: bea34c409f am: 36bfe3e01c" into rvc-d1-dev-plus-aosp am: e0b1ed5b0e

Change-Id: I1512bb79727dd26b00d7b0e2459c950fb8508089