Merge "PDL: tell ‘diff’ to output a colored diff" am: f263f853 am:...

Merge "PDL: tell ‘diff’ to output a colored diff" am: f263f853 am: a74afb64 am: 8c747fd2 am: fd11ff3c am: 14ec5950

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2127434



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