Merge "Hide the (obsolescent) android.app.maintenance APIs" into lmp-preview-dev