[automerger skipped] Merge "Move statsd related hidden API flag file entries...

[automerger skipped] Merge "Move statsd related hidden API flag file entries to packages/modules/Statsd" into sc-dev am: b0770ecb -s ours am: 1ed08ec3 -s ours am: 47816008 -s ours

am skip reason: Merged-In Iaa3d98ced5f3b67f891e5d648a5004acdf7a075c with SHA-1 48736cdd is already in history

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

Change-Id: Ie201052907e86352d9058a423c8b5e7cf5928a47