Merge "core-utils: Update version for IDisplay AIDL"