Merge "Create cpp aidl_interface for libstatsbootstrap" am: 10d4400cb7 am: 35d612b5ec

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

Change-Id: Iedf9b2f6b65f818f4f3e26b395ea44a25945204f