Merge "Fix issue #17329290: NPE during ContentProviderRecord.dump()" into lmp-dev