Merge "Merge "AIDL effect: Declare effectProxy class as final" am: 0c791f42bf am: 781acc7dbd am: d78ebd75f0 am: 057dbb9a9c am: 4e41cef1d0"