Merge "Fix hasGlyph() for pre-v23" into nyc-support-25.2-dev
am: 3ac1650526

Change-Id: I75d07a00e1f4a5d9b78060fac145eebcf598c82a