Merge "Deprecate function declarations, not definitions." am: 302b92a5 am:...

Merge "Deprecate function declarations, not definitions." am: 302b92a5 am: 00f15937 am: 6188e714 am: 5cb4f885

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2640609



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