am c7403258: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit 'c7403258':
Fix bug in TextLayoutCacheKey handling embedded nulls.
DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don't try to open an overflow menu under invalid circumstances.