Merge "Add package.html files to services metalava stubs" into sc-dev am: 55e909d4 am: 81fd231f

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

Change-Id: I0f0f979fd9d85c507544b47e1211f3b455cd825d