Merge "Update MediaProjection logging atoms for new windowing metrics" into aosp-main-future