Merge "Add manual CPP interfaces to EXCLUDED_CPP_INTERFACES for @EnforcePermission lint" am: 232e6429c1 am: aa49e07663 am: c88a239b30

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

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