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

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

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



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