Merge "aidl/ComponentStore: return error if listener is null." into main