[automerger skipped] Merge "AudioFlinger: timing code build cleanup" am:...

[automerger skipped] Merge "AudioFlinger: timing code build cleanup" am: 5455eb45 am: 66b6e1bc am: f6eb21b4 -s ours am: 6ee5a68b -s ours am: 92a3cc9f -s ours

am skip reason: Merged-In I5211f3b3cdb0284aa5a3d90f7b887e1a0d6e954f with SHA-1 a2a17c9e is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2626233



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