Merge "Update EffectUUID initialization" am: c7607bb50f am: 9e8d11d0a3

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

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